Merge "Memory leak fixes" into tizen