Merge "ChooserSelector shouldn't crash w/o IntentResolver" into tm-qpr-dev