Merge "Flash notification-related APIs should be restricted to system level access only" into main