Merge "Remove obsolete "headless" support"