Merge "Resources: fix race with creating theme" into oc-dev