Merge "Do not consider overlays when finding task to reuse." into oc-mr1-dev am: 32b477db15
am: e6a5f1c9d6

Change-Id: I12e71687671c86137e6e0a33ecfde4cb9582a510