What about the poor guy that was used to pass NO_LOCK_SCREEN=1 ?
I'd have kept this variable and set it if DEVICE_DEBUG is set.