Merge "Make ChooserActivity intents doccentric and transitory"