am 22891671: Merge "Multiuser support for notifications, take 1." into jb-mr1-dev

* commit '228916713db16dd536a8f3d7256b5726a2eaeb2b':
  Multiuser support for notifications, take 1.