Merge "Add ServiceManager.registerForNotifications"