Merging from ub-launcher3-master @ build 6327709 am: 0997905b95 am: 7e3d6cbd03

Change-Id: I7a4ab22b371968ed50878132107f939d901c7f38