Merge "Remove headroom selection type and move interval to support info" into main