I am pretty amazed at the lack of support on this issue from either ACF or Yoast. Both are major plugins used by squillions of people, so the fact they don’t work well together is a major issue. I would have thought they would be working together to sort this out. Not impressed.