Merge "Fix potential race in Theme creation" into oc-dev