Merge "Call handover improvements" into oc-dr1-dev