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