Add an overrides include that doesn't get committed so we don't have to worry about committing accidental debug builds
Pick Window maintenance: altogether fix both new-window and refresh modes