Merge "Transition invalidation bug fix."