Merge "Revert "Add massive logging to investigate blank Keyguard"" into lmp-dev