Merge "Follow API changes to NotificationListener." into jb-mr2-dev