Merge "Fix incorrect SV calculation in non-RT codepath." into oc-dr1-dev