Merge "Avoid PDN Tear down at Out of service scenario" into main