Merge "Fix race bug in attemptIncStrong"