Merge "fix window focus race in BaseKeyListenerTest" into jb-mr2-dev