Merging from ub-launcher3-master @ build 6437481 am: 9e99427ee2 am: c146b4fa8c

Change-Id: I2684fe365d52b2b83be1c55b97bf0592e400a18a