10.2 fixed this, judging by PTR. In fact, a lot of things are different about how moonkin form is handled, so no surprise.
So, throughout dragonflight, you could always hide the form. Use Glyph of the Ursol Chameleon. Switch back and forth a bit. Moonkin form will be hidden. I didn’t want it fixed, so I didn’t tell anyone.
On the bright side, the new forms are 100x better than I was expecting, and I always loved them. They look great!
Here is the form-hiding: