Merging from ub-launcher3-master @ build 6248758 am: 3210c06687 am: 20aaa198f3 am: eaba9530c9 am: 03351a5ab0

Change-Id: I8a926651bbaca3a678cc360adbc9d4854d2dd76b