Merge "Fix crash from folding/unfolding" into main