Merge "Support 24 clock displays in demo mode." into mnc-dev