Merge "Fixed EdgeEffect drawn on non-RecordingCanvas" into sc-dev