Merging from ub-launcher3-rvc-qpr-dev @ build 6827161

Bug:150504032
Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-rvc-qpr-dev_rvc-qpr-dev_6827161.html

Change-Id: I1407faf035596ddee7cf4ca58a98c1bd82eb5699