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

Change-Id: I73bb76a7ff3fe6d3e0a974b5cbaed34c632ee8ae