Merge "Small cleanup AccessibilityWindowManager#updateWindowsLocked" into main