Merge "Use a single EXTRA_HEADERS intent."