Merge "[DO NOT MERGE] Un-release unbundled chooser in QPR" into tm-qpr-dev