Merge "QS uses nickname for multiuser and profile name for singleuser." into jb-mr1-dev