Merging from ub-launcher3-master @ build 6219992

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

Change-Id: I921614e94ed987fa88f45501155baf145fb0b225