Merging from ub-launcher3-master @ build 6294827 am: 8674a882f6

Change-Id: I2ebab2c130e58129534aa147190cd4b6fcf67d7f