Merge "Revert "Don't force client composition when rounded corners are cached"" into main