Merge pull request #480 from Giftie/screensaver_settings_update