Merge "Accessibility active window not updated on time." into jb-mr1-dev