Merge "Avoid churning NumberFormat instances in ProgressBar"