Merge pull request #3893 from wsoltys/screensaverfix