Bug 936310 - Fix bug where setting lockscreen.enabled = false in the pro...

...file prevents startup