Merge "Refactor ScreenDecorWindowTests"