Merge "Disable unfold animation when animations disabled" into sc-v2-dev