* commit '2e10611a8526b2e6cdad9a2862c5ad7565cba7f6': Revert "Add massive logging to investigate blank Keyguard"