Merging from ub-launcher3-master @ build 6934851

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

Change-Id: Ie082cfabfc07e26db9d0bbb563376291b2b30491