Merge "ApiMain: Fix call to Linker::makeHeadline()"