Merge "Run animation *after* property sync" into nyc-mr1-dev