Merge "Fix WindowFocusTests#testTapNonFocusableWindow failed"