Merging from ub-launcher3-master @ build 6269120 am: 8f03c5c1ce am: 8df766f1ba

Change-Id: I1a28c59fb27daeb956eb743b3e2d3356a421d192