The following PR from @rainemak was recently merged (it may hopefully make it into the next release, if not the release after that):
That’s not a fix for the bug tracking this one, so I’ve not yet marked this bug as fixed, but it’s quite possible that @rainemak’s investigation and fix may resolve this one too.
Once this change is released, it would be really helpful if anyone who experienced this could test again and post back to confirm whether it’s fixed or not.