Merge "Add flag for NotificationLockscreenUserManagerImpl refactor" into main