
Automatic merge from submit-queue (batch tested with PRs 44447, 44456, 43277, 41779, 43942) Clean up pre-ControllerRef compatibility logic **What this PR does / why we need it**: **Which issue this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close that issue when PR gets merged)*: fixes #43323 **Special notes for your reviewer**: No **Release note**: ``` NONE ```