Merge "Improve multi-user app management." into jb-mr1-dev