Merge "Remove phone specific shade controller from KeyguardViewMediator" into rvc-dev