Merge "Fixed crash in EdgeEffect after fling gesture" into sc-dev