Merging from ub-launcher3-master @ build 6188107

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

Change-Id: I32199dfedce8e3e22bfbf9579fee2930d84f4cbd