Merge "Merge branch 'ub-launcher3-dorval-polish2'" into oc-mr1-dev