Merge "API cleanup: NotificationListener" into jb-mr2-dev