am 8ad682dd: Merge "Close open folders before moving to -1" into jb-ub-now-indigo-rose

* commit '8ad682ddda37ce6bc438895f3adb8617244d0e46':
  Close open folders before moving to -1