Merge "Maintain parity with central surfaces impl." into udc-dev