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

* commit '537ecd451b021545b8d9c4009879fe961bff3de6':
  Fix issue where deleting item from folder leaves extra page