Merge "Update the style for collapsing toolbar" into sc-dev