Merge "StretchEffect changes" into sc-dev