Merge "[Role Logic Move] Make setNotificationListenerAccessGranted user-aware" into main