Merge "Update the new animation for collapsing toolbar" into sc-dev