Merge "Rebind notification listeners for current user." into jb-mr2-dev