Merge "Feature flags support in Chooser" into tm-qpr-dev