Merge "API: Recognize an "Api-User-Agent" header"