Merge "Making the content resolver work with result intents."