Merge "Decouple CentralSurfaces and NPVC" into tm-qpr-dev