Merge "API and doc cleanup, plus small animation/UI features" into jb-mr2-dev