Merge "Send USER_SWITCHED with the correct permission" into jb-mr1-dev