Merge "Always startOrMigrate connection when caps change"