Merge "Listen for the current user's notifications only." into jb-mr2-dev