Merge "Apply the scale to surfaceinsets when computing crop region"