Merge "Remove more methods from CentralSurfaces" into tm-qpr-dev