Merge "Fix local Binder call scenario of IMMS#addClient()"