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

Change-Id: I964d23b0daad2326989ece5f8ffc086b6286cb44