Merge changes from topic "fix-weird-animation" into main

* changes:
  Fix jiggle when opening custom manual modes
  Allow turning off currently active modes