Merge "Fix NoFocusedWindow_DoesNotSendDuplicateAnr test" into main