Merge "Update KeyguardViewMediator constructor" into main