Merge "Fix ViewTest#testWindowFocusChanged" into jb-dev