Merge "Merge "Always startOrMigrate connection when caps change" am: 52885599 am: 38904b15 am: 6ae4584b am: 4972abfd am: 3c3afe0d"