Merge changes from topic "fling_after_pull" into sc-dev

* changes:
  Allow EdgeEffect to fling during pull
  Remove edge effect type from the API.