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

* commit '0259c629cb5b280d0d9c821f8b1685707d7ba589':
  Fix issue where deleting item from folder leaves extra page