Merging from ub-launcher3-master @ build 6877130

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

Change-Id: I791d64951e4ccf494d72060722e26835bbece713