Merge "Update SurfaceFlinger to handle stretching of surfaces that are part of a scrolling container" into sc-dev