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