Merge "Fix double CONN_LOCK call leading to deadlock" into tizen