Merge "Cleanup flag for notification sound Uri permission check" into main