Respect user's 12/24 hour preference consistently (#29237)

Respect user's 12/24 hour preference consistently (#29237) #982