Revert "Fixes conflict when adjusting a layout while a transition is setup"

This reverts commit 4b62815e61e5850355ab552572cfc99a1557a81d.
Review of the transition conflict fix
Adds unit tests for transitions