Merge "Do less work on configuration change." into nyc-mr1-dev