Merge "Make USER_PRESENT broadcast per-user." into jb-mr1-dev