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

Change-Id: I5312fc052b0bcc4b4f0e168c3b48bb86aa3b8a67