Merge "Pre-work to decouple ChooserGridAdapter" into tm-qpr-dev