Merging from ub-launcher3-master @ build 6767682

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

Change-Id: I5e9c73a7ac3033fe82006c4bd72824f56b8988f8