Merge "Don't always fallback to clockTick for EFFECT_TICK." into oc-mr1-dev