Merge "Prevent duplicate loader onLoadFinished calls on config change" into nyc-dev