[Merge] Cherrypick 2 from warp1220

WTD-1220

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

@@ -47,6 +47,7 @@
 @import "controls/menus";
 @import "controls/time-controller";
 @import "features/imagery";
+@import "features/time-display";
 @import "forms/mixins";
 @import "forms/elems";
 @import "forms/validation";