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

Change-Id: I3cb6ae4fda47ee82e608f3c7ab64ffedc5c65f1e