Merge "Align system time 12-24 hour format in the time slot information" into sc-dev