Merge "SF: Handle buffer scale transforms when calculating layer geometry"