Item views should not override height when a different layout is specified. Fix some fallout from that change.