Merge "Make CentralSurfaces optional" into tm-dev