Merge "Destroy Save UI when it's hidden without a pending restoration." into...
Merge "Destroy Save UI when it's hidden without a pending restoration." into oc-mr1-dev am: 415c7aad
am: eadf1abf -s ours
Change-Id: Ibcbad243f3bdb3d92e7d560ee07758a8f92ea0e6