Merging from ub-launcher3-master @ build 6519151 am: 225204bc25

Change-Id: I4b0ed1051cec674f3d3e0e473b7d13666553534b