Fix swipedismiss animator on newer APIs when AnimatorProxy is not need
Merge branch 'dev'