Merge "Remove user-triggered disconnect counters"