Merge "Quick settings user display and switching" into jb-mr1-dev