Merge "Preserve but don't draw accessibility focus for unfocused windows"