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

* commit 'c037282c1ca0d7589168c73f1cf8b19ecc3ffca4':
  Rebind notification listeners for current user.