Merge "Revert "Add cancel event flag in Key up event"" into devel/master