[Clocks/Timers] Merge in latest CSS

Merge in latest CSS from WARP-specific branch, WTD-1220.

platform/commonUI/general/res/sass/_main.scss

@@ -45,9 +45,9 @@
 @import "controls/controls";
 @import "controls/lists";
 @import "controls/menus";
-@import "controls/time-controller";
 @import "features/imagery";
 @import "features/time-display";
+@import "controls/time-controller";
 @import "forms/mixins";
 @import "forms/elems";
 @import "forms/validation";