Merge "Bind Toolbar colors (2/2)" into main