am 165067a2: Merge "Stop double-animating when removing the last editor. Fixes jump cuts" into jb-mr1-dev

* commit '165067a26a38b2d92f0495fd4282da0c49079d63':
  Stop double-animating when removing the last editor. Fixes jump cuts