Merge "Recovers on boot when scan of data app fails" into qt-dev