Merge "Removing all usage of LauncherProvider" into udc-qpr-dev