Merge "[queens] Smooth out OVN backend"