Merge "Make count for numSyncsInProgress static"