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

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