Fix track height calculation.
Automated merge of next-stable