Merge "Fix visibility of VariableDateView" into sc-qpr1-dev