Merge "ConnectivityController tracks jobs by UID."