Merge "Revert "Allow IntentSender to use auto-opt-in"" into main