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

Change-Id: I9044d46d68f7fcb471f584d75225137c3b6f171b