Merge "Reduce the spring effect on All Apps" into sc-dev