Merge "Add public API to Choreographer." into jb-dev