Merge "Fix use after free issue"