Merge "Merge "Merging from ub-launcher3-master @ build 6304996" into rvc-dev am: c83758f223 am: 69ebef4c4a" into rvc-d1-dev-plus-aosp