Merge "Fix inconsist color filling on collapsing toolbar" into sc-dev