Merge "Fix prevent issues" into tizen_2.1