Merge "Add animation to button navigation settings page" into tm-dev