Merge "Fix test for headroom APIs" into main