Merge "Fixing threading around mConnections in Scheduler"