Merge "Fix flickering issues with divider during split animation" into main