Merge "Skip null surface when validating transition" into udc-dev