Merge "KeyguardViewMediator refactor"