Merge "Remove display.qservice from service_contexts."