Merge "Fix folder morphing animation" into main