Merge "Rename RecoveryManager to RecoveryController"