Merge "User the notification manager for current user" into sc-dev