Merge "Update accessibility focus correctly in AccessibilityWindowManager"