Merge "Register only one binder listener and keep a map of listener to executor." into tm-dev