Merge "No multiuser settings for phones" into jb-mr1-dev