Merge "Fix divider animation and wrong split bounds"