am d04215c4: am 0a41431d: Merge "API and doc cleanup, plus small animation/UI features" into jb-mr2-dev

* commit 'd04215c440e7b7f4bbfe8aaa9a47ccdf3a8dacf5':
  API and doc cleanup, plus small animation/UI features