Minor bug fixes related to Lock Screen creation/destruction.