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

Change-Id: I3f45f078c845c5362deb1fbaa3d6a6cb54f2ae41