Merge "Bring up new user setup dialog when tapping on new user" into jb-mr1-dev