This may be specific to tauren and their large hotboxes but while swimming on the surface druids will randomly unshift from aquatic form which is extremely annoying.
Also, this is probably working as intended but jumping at all in the water will automatically unshift you which is also extremely annoying. I believe a delay of a second or two should be implemented to prevent on shifting while still in the water by accidental jump