Merge "Make manage apps UI multi-user aware." into jb-mr1-dev