am 03b86a9b: am 564c03da: Merge "Really hide the settings button on tablets." into jb-mr1-dev

* commit '03b86a9b23f1298884d3394771d20d4039ed24ef':
  Really hide the settings button on tablets.