Merge "Catch RejectedExecutionException when loading app data." into nyc-mr1-dev