Merge changes from topic "b249277686_shadeCs" into udc-qpr-dev

* changes:
  Move shade code out of CentralSurfaces
  Move shade code out of CentralSurfaces