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

Change-Id: Ie785f28b864c0b365f4e1fb7cc0339b452d2da1b