Merge "Don't do full backup/restore before setup"