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

Change-Id: Ifbad5bfc6783792cf344effcd5e36a0386ef5155