Merge "Only send resolve callbacks for subscribed service"