Merge "Adds ChooserSelector" into tm-qpr-dev