Merge "Revert "Pinning components in ChooserActivity""