Merge branch Mario/electro_sticky_trail_fix (XXS merge request)
Fixes an issue with Electro orbs when they become sticky which is documented in #2582 (closed).
Fixes an issue with Electro orbs when they become sticky which is documented in #2582 (closed).