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

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