Merge "Add colorProgressBackgroundNormal" into pi-dev