am 48fd9d0e: Merge "Fix window focus change timing issue" into jb-dev

* commit '48fd9d0ebc3790fbe9f0319123c129a1c0aa7aaf':
  Fix window focus change timing issue