Merge "Stop setting fixed 12-hour and 24-hour time formats in layouts" into ub-deskclock-escargatoire
am: f301ed9

* commit 'f301ed9af9733551379566add8f7f568aef60043':
  Stop setting fixed 12-hour and 24-hour time formats in layouts