Merging from ub-launcher3-master @ build 6952418

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

Change-Id: Id8ec665ff7be486b794807f6524e385728ea7717