Merge "Apply the scale to surfaceinsets when computing crop region" into mnc-dev