Merge "Remove existing divider immediately when entering split" into main