Merging from ub-launcher3-master @ build 6075050

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

Change-Id: Ic70d03c7dc15856ecf31cb2d05fbbd9f47c4f9d0