Merge "Fix up some jank from unnecessary reinflation" into oc-dev