Merging from ub-launcher3-master @ build 6294827 am: 8674a882f6 am: 6b9d3c4a06 am: 64ab29be4f am: 0ff2e03b3d

Change-Id: I48a38f01fd07b5276485967d4d42e185792b7da7