Merge "Take advantage of KeyEvent.isConfirmKey"