Merge "Handle more config changes and handle onDestroy" into nyc-dev