For those having this issue, just got a reply to my TSI and looks like this is a known issue that Apple is actively working on fixing. Hoping this gets resolved soon!