Merge "Switch Chronometer to use ICU instead of duration_hours etc"