Merge "Replace DateView with VariableDateView (1/2)" into sc-v2-dev