Merge "Adjust Color Provider to handle consecutive calls" into main