Merge pull request #6310 from mahdihijazi/fix_animation Android: Fix settings screen animation if Animator Duration Scale is Off