Merge "Fix the prevent issue" into tizen_2.1