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