Merge "Updated StretchEffect types" into sc-dev