Merge "[RONs] Eliminate invalid points from ProgressStyle" into main