Merging from ub-launcher3-master @ build 6834159

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

Change-Id: I4350d0ddedd107d7005625480aefda19e5d06ba2