Merge "Fix Prevent Defect" into tizen