Merge "Clean up remaining TODOs in RecoveryController." into pi-dev