Merge "Updated EdgeEffect stretch distance" into sc-dev