Merge "Deduct padding from widget size only if padding has been inset" into sc-dev