Merge "The active window for accessibility purposes can be miscomputed." into jb-mr1-dev