Merging from ub-launcher3-master @ build 6018893

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

Change-Id: Ic8bb5eccb6edc0cf639ac08c404c930981721760