Merge "Fix issue #70722141: Fix broken WindowTest.testSetLocalFocus"