Merge "Revert "Hide keyguard immediately on DOZING->GONE"" into main