Merge "prevent: fixed ecs related prevent issues" into tizen