Merge "Revert "Respect buffer source crop in client composition.""