Merge "Update the collapsing toolbar layout" into sc-dev