Rework handling for terms CORS error
Rework handling for terms CORS error

Earlier changes in this branch removed the "next step" of saving from the
dialogs, so we need to fold in the CORS error case.

matrix-org/matrix-react-sdk,matrix-org/matrix-react-sdk,matrix-org/matrix-react-sdk,matrix-org/matrix-react-sdk,matrix-org/matrix-react-sdk,matrix-org/matrix-react-sdk