Merge "Fix dumb bug merging receivers for multiple users." into jb-mr1-dev