Merge "Ensure header view expected height accounts for tabs." into main