Merging from ub-launcher3-master @ build 6294827

Bug:150504032
Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-master_rvc-dev_6294827.html

Change-Id: Ie242e3907119fdbeabb363421bbca85b43c34267