More Keyguard fixes that I'm returning after reverting

Change-Id: Ibbda5839b72f6a507ac5b66b116f1dcd06f28ff7