Merge "Really hide the settings button on tablets." into jb-mr1-dev