Merge "Reduce contention of ApplicationsState locks" into nyc-mr1-dev