Merge "Relax height check for folding feature." into main