Merge "fix selection issue in OnCursorKeyEvent" into devel/master