Merge "Improve the headroom tests to verify the support info" into main