Merge "Pinning components in ChooserActivity, take 2"