Xscreensaver for lockscreen support
Merge branch 'feature/lockscreen' into devel