Merging from ub-launcher3-master @ build 6248758 am: 4bff19c5df am: b442aaf20e

Change-Id: I94ffe839a0b6b367f08337d6aa9d49c768a88394