Merge branch "cm-11.0" into kylin
Base: fix ClockView ActiveDisplay

why no body report this bug?
this happen since AD merger into omnirom for the first time
i found this bug after using 24 time format LOL