Fixed bug where locking the screen causes a crash
Merge branch 'dev' of https://github.com/sebiva/TouchDeck into dev