Merge "Enable KeyguardViewMediator logs"