Merge "Remove getToolbarColorId" into main