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

This reverts commit 3e5371aba3eb29efb9574881212cba0975c168d7.

Change-Id: I9e02a3d72f66a1eabb1f25d95417c855459556cc