Merge "Collect background stats: syncs" into oc-dev