Merge "Finish unfold Shell transition on fold" into 24D1-dev