Merge pull request #699 from houqp/new_ui_fix

Bring back screen saver support