Merge "Made ScreenDecorWindowTests less flaky"