Merge "Fix PatchTrack retry for ClientProxy::obtainBuffer" into pi-dev