Merge "Fix Exception issue on Add and remove event listener" into tizen_2.2