Merge "Fix window focus change timing issue" into jb-dev