Merge "Fix the deadlock issue for eSIM." into pi-dev