Merging ub-launcher3-master, build 5437471
am: 01aea983ef

Change-Id: I4648285b8687059b4d6570a6e2bc9903396bd113