am 8df1285d: am 0259c629: Merge "Fix issue where deleting item from folder leaves extra page" into jb-ub-now-kermit

* commit '8df1285d0d1291adb3eeab66f9a1b1b77c5cbb73':
  Fix issue where deleting item from folder leaves extra page