Merge "Always resolve private space sms/mms intents in the main user" into main