Merge "Fix a runtime restart when cycling between 4 users" into jb-mr1-dev