Merge "Add ContentObserver for animation scale changes" into nyc-dev