Merging from ub-launcher3-master @ build 6111698

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

Change-Id: I599b5e78b721711694a3e96f6527f78368b3033a