Merge "Fix flaky test FrameworksServicesTests:ScreenDecorWindowTests."