Merge "Owner should not be announces as a user switch." into jb-mr1-dev