Merge "[RESTRICT AUTOMERGE]: Fix a race condition in the crash reporter" into oc-dev