Merge "Fix Launcher3 issues due to hardcoded default user" into udc-qpr-dev