Merge "Fix dispatch of onRestoreFinished()" into mnc-dev