Merge "Use correct feature to opt in non-PendingIntents" into main