Merge "rollback source code because of lockup issue" into tizen_2.2