Merge "Handle race condition and mutex issues." into tizen