Merge "Explicitly specify current user everywhere home is started." into jb-mr1-dev