Merge "Pass empty srcRectHint if overlay is present" into main