Merge "Check if surfacecontrol is valid in getBufferTransformHint" into main