Merge "Remove CentralSurfaces from ShadeController" into tm-qpr-dev