Merge "Don't overwrite user agent header if app specified one" into mnc-dev