Merge "Fix progress tint attributes"