Merge "Restore can begin while clearing app data is in progress" into qt-dev