Merging from ub-launcher3-master @ build 6799015

Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-master_master_6799015.html

Change-Id: Ib9d52ba333f2982d2420cab42a0935e8e8a303b3