Merge "Pinning components in ChooserActivity"