Merging from ub-launcher3-master @ build 6294827 am: 8674a882f6 am: 6b9d3c4a06 am: 64ab29be4f

Change-Id: Iebdabaa7282c69b57838bc9db3f7a261781779fd