Merge "Fix potential race in DexManager" into oc-dev