Merging from ub-launcher3-master @ build 6369897 am: 884f8f217f am: d3ba747e6d am: d5e144463f am: 9c777f6495 am: 55be398eea

Change-Id: I151a1bddb7a06118608c08fd131a7bb7a08f3283