Merge "Implementing an unfold animation using CannedAnimationController" into main