Merging from ub-launcher3-master @ build 6048063

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

Change-Id: I891517b70777952c7027b64dd5e25da8901e4416