Merge "Rename code related to cross-profile intents."