Merge "Disable kNoOutputOverlap optimization."