Merge "Fix app headers in settings" into mnc-dev