Merge "Revert "Delay handover tear down due to policy for call"" into main