Merge "Update screensaver preference summary when on."