am 083c1918: Merge "Fix ViewTest#testWindowFocusChanged" into jb-dev

* commit '083c19188c6bd1129ad157be4470830218c1572a':
  Fix ViewTest#testWindowFocusChanged