Merge "Updated HWUI to calculate the stretch bounds for a surface" into sc-dev