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

Change-Id: I109d983b5fbcbbb7433ffc6cb00770211b25bbd1