Merge "Fix heap-use-after-free" into tizen