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

Change-Id: I3fee2a4fdb36e90743402d107aaf898c6e190dcb