Merging from ub-launcher3-master @ build 6327709 am: 0997905b95 am: 7e3d6cbd03 am: 50166894ff

Change-Id: Ifff3f2d7f3d535ea66fa0e35acceff5d73bbfc44