Merge "Fix resource leak" into tizen