Merging from ub-launcher3-master @ build 6976145

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

Change-Id: I4368a82b71b761fdb11f49c976e4eb1657b3ca64