Merge "added check for listener validation" into tizen_2.2