Merge "[timepicker] remove 'extended' from the style name"