[2019] Make Surge not put Escape on cooldown if we have both double codices unlocked.

Please can we be able to Surge and then Escape before cooldown being activated if we have both the double Surge and double Escape abilities unlocked.