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