Merge "Time for dark theme doesnt format 24 hr correctly" into rvc-d1-dev