Merge "Api review: NotificationManager" into nyc-dev