Merge "Fix divider animation" into nyc-dev