Merge "Fix BaseKeyListenerTest"