Merge "Prevent multiple calls to onDone() in AccountSetupOptions"