Merge "Report more metrics in RecoverySystem"