Better fix for deadlock in a situation with an IME and a URP client

This reverts commit 2225ceb12cbf4b4886d270aef232a70e7ebf7b12.

Change-Id: I9e02a3d72f66a1eabb1f25d95417c855459556cc