Merge "Fix memory leak" into tizen_4.0