Merge "Merge "Merging from ub-launcher3-rvc-dev @ build 6621659" into rvc-dev am: 738b1af342 am: f7897465e3 am: 0e93463f62" into rvc-qpr-dev-plus-aosp