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