Merge "Removing some unused overrides in Launcher" into udc-qpr-dev