Merge "Extract ChooserActivity inner ViewHolder classes" into tm-qpr-dev