Merge "Add ShadeController to KeyguardViewMediator" into tm-qpr-dev