Merge "rename add/removeCallback to register/unregisterCallback" into lmp-dev