Merge "Adjust crop to account for child scaling" into main