Merge "Remove headless flag" into main