Merge "SF: always preallocate the client composition buffers" into sc-dev