For some reason the Annotate tool has an extra padding when compared to other tools. This makes the UI to flicker a bit (specially with D12939 applied).
Before/After with D12939:
Control group:
After:
Before: