Merge changes I1069e3a1,I2dc2f578 into main

* changes:
  Finish unfold Shell transition when fold is merged in
  Fix finishing unfold shell transition immediately after folding