Lockscreen: Code cleanup

Change-Id: I7d753df568196094cfcb23490161d8d2ae048598