Merge "Use the context_priority extension when present." into gingerbread