Merge "Fix animation problem when swipeing up app to screen edge and release" into sc-v2-dev