Merge "Fix NPE before CentralSurfaces is registered" into tm-qpr-dev