Merge "Don't show multiple wipe warning dialogs"