Merge "Enable Chooser test." into tm-qpr-dev