fixes 17164 Transition issues on Samsung devices