Merge changes I7b3f4c68,I9f022a08 into klp-dev

* changes:
  Rename offer() to add(), remove/hide some APIs.
  Sort order is sticky for session, back leaves.