UE-51608 still occurring in UE4 4.21

The issue where the toast message “Loading Visual Studio” never closes when opening a C++ file is still occurring for me on UE4 4.21. In the issue UE-51608, it says the fix version was 4.19, but I’m still getting this issue. Are there any workarounds for this issue, or is it getting fixed in a future release?