Merge "Update for handling callback of threads" into tizen_2.1