Merge "Correctly handle when the user has no explicit time_12_24 setting"