Merge "Get rid of now-superfluous "backup or restore in progress" tracking"