Remove unneeded variables in build.gradle
Always lock phone on shutdown; Lock/Unlock phone based on connectivity on startup
Add LockState tests; clean up code