Merge "Add tests for new EdgeEffect API" into sc-dev