Merging from ub-launcher3-master @ build 6356169 am: 3ca049371b am: d1f865b138 am: d16dcd1f43

Change-Id: I54384d2cf1727cc1f2a430e0c7f1bfa0453b79d5