Merge "Removed @FlakyTest from ScreenDecorWindowTests" into pi-dev