Merge "Fix incidentd stack use-after-return" into rvc-dev