Merge "Screen saver string fixes" into nyc-dev

    <!-- Dream settings screen, caption for when dreams are disabled -->

    <string name="screensaver_settings_disabled_prompt">To control what happens when the phone is docked and/or sleeping, turn screen saver on.</string>

    <!-- Dream settings screen, action label, when to dream -->

    <string name="screensaver_settings_when_to_dream">When to turn screen saver on</string>

    <string name="screensaver_settings_when_to_dream">When to start screen saver</string>

    <!-- Dream settings screen, button label to start dreaming -->

    <string name="screensaver_settings_dream_start">Start now</string>

    <!-- Dream settings screen, button label for settings for a specific screensaver -->