UE4.20 is missing the IntelliSense IncludePath for the *.generated.h files

I’ve been having this problem in 4.20.3 after we upgraded from 4.19. But no one else on the team seems to be getting it.
I found that in AddModuleToCompileEnvironment (in UEBuildModuleCPP.cs) the GeneratedCodeDirectory for my project was something like

Intermediate\Build\Win64\MyProjectEditor\Inc\MyProject
But looking in my Intermediate folder I found that my generated code is in
Intermediate\Build\Win64\UE4Editor\Inc\MyProject

I tried doing a string replace on the GeneratedCodeDirectory path to look in UE4Editor instead of MyProjectEditor before adding it to the IncludePaths. After regenerating project files my Intellisense seems to be finding my generated headers properly. I’m no longer seeing errors all over the place.

// This directory may not exist for this module (or ever exist, if it doesn't contain any generated headers), but we want the project files
// to search it so we can pick up generated code definitions after UHT is run for the first time.
if(AutoGenerateCppInfo != null || (ProjectFileGenerator.bGenerateProjectFiles && GeneratedCodeDirectory != null))
{
    String s = GeneratedCodeDirectory.FullName;
    s = s.Replace("\\Build\\Win64\\MyProjectEditor\\Inc\\", "\\Build\\Win64\\UE4Editor\\Inc\\");
    DirectoryReference dr = new DirectoryReference(s);

    IncludePaths.Add(dr);
}