Merge all the (disconcertingly missing) track/region/etc height changes from 2.0.