Merge "Merging from ub-launcher3-rvc-dev @ build 6577335 am: 8020bf2f4b am: e0a0876062 am: 3e6a5661ac" into rvc-qpr-dev-plus-aosp