Were you able to resolve this? This still seems like an issue in iOS 15