fixes 17164 Transition issues on Samsung devices

(cherry picked from commit d54a26593392d90eb8646402f732ddbad36a33db)