Merge "Remove headroom interval methods" into main