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

Change-Id: Ibe4d68378d43e91a39de36964e8a007eac8f6d06