Merge "Move Choreographer to libgui."