Merge changes I3d5a16fd,Ie91771be into main

* changes:
  Remove linked transitions
  Ensure that transitions are started only once