Merge "Fixes the connection listener wrong thread crash for overview proxy"