Merge "Ensure that the reorder preview and what gets submited uses the same solution." into tm-qpr-dev