Merge "Calculate min height for header in code" into tm-dev