Merge changes If030f175,Ia51e7e9b into main

* changes:
  Consider transition change info for task snapshot
  Remove confused parameters of snapshot controller