Merge "Run cleanup before end actions of ViewPropertyAnimator." into nyc-dev