fixed CWS id of keyboard-handler and window-state samples