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