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

Change-Id: Iff6af3991ed2894a9335203dabbaa7a8872500d9