Merge "Change EXTRA_TIME_PREF_24_HOUR_FORMAT from boolean to int"