Could you try removing the workarounds that you put and try if the issue was fixed as their was a fix released just yesterday. 


Can you confirm if this has somehow fixed your concern?