Merge "Change scroll animation" into sc-dev