Merge "Fix issues in TextServicesManagerService"