Merge "Fix pose predictor jank." into oc-dev