Merge "Rework scan order fetch logic for decoder"