Merge "Remove power menu on tablets." into jb-dev