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

Change-Id: If1bad19eb25126c1b5d1e650ed245ad677ffacdc