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