Merge "Use same height for start and end of date view" into tm-qpr-dev