EasyFlight

The desired form is now decided on a priority list:

Go to travel form when Outdoors or swimming
When falling in a no-fly zone, or indoors, go to cat form, to reduce fall damage

Otherwise, try to revert to your previous form