Merging from ub-launcher3-master @ build 6369897 am: 884f8f217f

Change-Id: Ib94ddd0edc0e9298bda0fc08454a633195c5830c