Merge "Tie screen saver to the screen off timeout." into ics-mr1