[FIX] TimePicker time no longer than 24 hours
Merge
Merge