Merge "Call deferred windowFocusChange when draw complete" into jb-dev