Bug fixes for decouple changes
Make transitionend a flag