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