Merge "Revert "Merging from ub-launcher3-master @ build 6294827"" into rvc-dev