issue: [[https://linear.app/comm/issue/ENG-9039/investigate-flow-errors-in-nux-tips-overlay | ENG-9039]]
I need this in the following diff, because without splitting those types in `AnimatedView` I get a flow error
Updated other places because I figured it's better if they are consistent