Merging from ub-launcher3-master @ build 6327709 am: 0997905b95 am: 58def8dda4

Change-Id: I815ca07a0dceaaa4022eb2d98c24d03aeb8d8cc7