Merge "Fix state deletion for transient backup issues." into rvc-qpr-dev