Merge "Improve screen on/off logic in slideshow." into ics-mr1