Merge "Split out whether frame callback and tick is scheduled" into oc-dev