Merge "Merging ub-launcher3-qt-r1-dev, build 5718001" into qt-r1-dev