Merge "Fix ScreenDecorationsTest failures" into sc-v2-dev