Revert "keyguard improvements:"

This reverts commit ad624e3ab6376b3f2ea9499a99d1b9f57fdf636f.

Change-Id: I0cc1e01954456e3aa79e47996810798402b75331