Merge "Fix divider showing when children appear" into main