Merge "fix prevent issue" into tizen_2.1