Winnipeg proposing two-year COVID recovery plan