Merge "Updated EdgeEffect test to verify stretch" into sc-dev