Merge "Fix old remaining i18n bugs on TimePicker:" into klp-dev