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

* commit '43ba50b04d19dcbc806653dc173bf28d7779d068':
  Fix ViewTest#testWindowFocusChanged