Merge "Unblock IPC call in TextServicesManagerService"