Merge "Block until userdata backup/restore has taken place"