Merge "Adds cross-profile intent filters for the Settings app"