Merging from ub-launcher3-master @ build 6294827 am: 8674a882f6 am: 6b9d3c4a06 am: 080fda0b66

Change-Id: I75c872713ab2162c67dc5d36fd06efd5e31af1ae