Merge "Destroy Save UI when it's hidden without a pending restoration." into oc-mr1-dev