Merge "Enable telephony and SMS intents redirection to the main user" into main