Merge "Fix source crop that's being sent to hwc for sf caching" into sc-dev