am a6ff69ed: Merge "Show screen saver toggle on tablets." into ics-mr1

* commit 'a6ff69ede0fa9868464a1a7059cad8fb3838c5ab':
  Show screen saver toggle on tablets.