Merge "Merging from ub-launcher3-rvc-dev @ build 6492476 am: 6e0d05fc41 am: a668e4b4e3" into rvc-d1-dev-plus-aosp