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

Change-Id: I671b9503a2733ec006f53a3340cfc100af42d312