Merge changes from topic "revert-10602670-XFOJAPBNWU" into rvc-dev

* changes:
  Revert "Some clean-up of divider code in preparation for bugfixes"
  Revert "Don't apply ime adjustments/dims if split is not active"