Merge "Add alternate intents and refinement callbacks to ChooserActivity" into mnc-dev