Merging from ub-launcher3-master @ build 6369897 am: 884f8f217f am: 23f879c314 am: 3322721948

Change-Id: Ibcf79ef93fa9e06fc2f34fb10f05e59b87f93979