Issues with annotate without controls

[miiraheart]

Steps to reproduce :

• I do ctrl+q to enter annotate
• I do ctrl+qto exit annotate
• I do ctrl+option+q to enter annotate without controls
• I can see the controls (unexpected)
• I try ctrl+option+q to exit annotate without controls but it removes only the controls and stays in annotate without controls
• I do ctrl+option+q again to exit annotate without controls, it stays stuck until press esc
• I do againctrl+option+q to enter annotate without controls
• I do not see the controls, as expected
• to exit annotate without controls I need to either do ctrl+q or esc (unexpected)

I have Save Session option on, I don't know if this this behavior is the expected behavior, but I expect annotate without controls to not show controls and get dismissed with the same shortcut that triggered it.