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