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

Change-Id: Iae04db5d9c56f8e2c8c4cfa6bf409e311fb13eac