You should only be able to despawn your dragon after you have not taken damage for 10~ seconds.
After watching the Octaaf/Lorean match, I agree in part. It was really easy to shift safely out of Dragon form in the middle of combat as long as friendly units were around.