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

* commit '20329dcb37fffca1de3ded6b58341e87cc43c4a9':
  QS uses nickname for multiuser and profile name for singleuser.