Merge "Do not prematurely update position while bounds animating." into nyc-dev