Merge "Don't crash during setup of secondary users" into jb-mr1-dev