Merge "UpdateEngine: fix cleanupAppliedPayload impl" into rvc-dev