Bug 1059650 - Prevent getting into broken state during transitions