Fast on/off switch for the new 3D Origin.

The 3D Origin is useful, but it makes it nearly impossible to rotate a camera or light around its point of interest.

Right now, the only workaround is to open the Viewport Options, disable the Origin, do the rotation, and then enable it again. That workflow is slow and frustrating.

What we need:
a) A dedicated Origin on/off toggle directly in the toolbar (with a keyboard shortcut) when the 3D Origin is enabled.

or

b) An updated 3D Origin design that includes a center handle (Point), allowing us to rotate directly around the point of interest without disabling the Origin.