am 593aca12: Merge "Support 24 clock displays in demo mode." into mnc-dev

* commit '593aca12c2f7bf39ca8d4ae944f36a88bd4a48cf':
  Support 24 clock displays in demo mode.