Merging from ub-launcher3-master @ build 6369897 am: 884f8f217f am: d3ba747e6d

Change-Id: I7306d1e76771cb63ba006158cb265af6cfefbd8d