Merge "Use 24-hour settings for time formatting"