Merge "Fix invalidateTransition method"