Merge "Skip stop if keepalive is already in stopping state"