am 78bb372f: am af927234: Merge changes I7b3f4c68,I9f022a08 into klp-dev

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