Merge "pass frame deadline to Choreographer"