Merge "Fix DummyNativeWindow to respond to new query"