Revert "Merge pull request #24874 from jmcanterafonseca/fix_settings_animation"

This reverts commit 8ac5a26ca1ba5a8aaae7bf45cc80a88c2d2f8daa, reversing
changes made to dff5b849df3f34b3f88dbc37bdd21254e4e5a880.