Merge "Fix split screen unfold animation" into main