Undo should not result in a "rename" tracking session

Due to perf issues of bringing up the rename prompt, I've been making use of renaming tracking feature to rename symbols because it's much faster. However, I keep getting into states where it gets "confused" and cannot get it to auto rename to the name I want. Here's an example:

Steps to Reproduce:

1. Using editor, rename Class -> NewClass

    public class Class
    {
    }

Should look like this:

2. Press ESC (or start typing) to dismiss renaming tracking
3. Press CTRL+Z to undo rename
4. Rename Class -> NewerClass
5. Drop down lightbulb

Expected Behavior: To get code fix to rename Class to NewerClass

Actual Behavior: Get a code fix that asks me to rename NewClass to NewerClass