Merging from ub-launcher3-master @ build 6248758 am: 3210c06687

Change-Id: I2b510554913b8a5444620b711547d962b5184002