Merge "The active window for accessibilitiy incorrectly tracked." into jb-mr1-dev