Merge "Fix ScreenDecorWindowTests." into rvc-dev