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

Change-Id: I080662459cbf6eeca9c4d6e4e80459efcbf83258