[z2659] Improve phase 2 transitions for Onyxia

Signed-off-by: Xfurry <xfurry@scriptdev2.com>

(based on commit 28b9531)

Signed-off-by: Xfurry <xfurry@scriptdev2.com>

(based on commit SD2-TBC[s2707] - 6870980)

Signed-off-by: Xfurry <xfurry@scriptdev2.com>