Merge "Fix a bug where restartLoader would result in a stuck loader" into nyc-dev