Merge "check window focus before move into next steps" into jb-mr2-dev