Merge "Revert "Change default mode for ACCESS_NOTIFICATIONS"" into main