Merge "Merging from ub-launcher3-rvc-dev @ build 6617269" into rvc-dev