Merge "Do not consider overlays when finding task to reuse." into oc-mr1-dev