Merge "Remove deprecated toolbar setState usages" into sc-dev