am ed7989e4: am 01996793: Merge "Remove user switcher from long-press power menu" into jb-mr1-dev

* commit 'ed7989e49fd2c668865b156cae5f5faa1603825a':
  Remove user switcher from long-press power menu