Merge "Remove user switcher from long-press power menu" into jb-mr1-dev