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

* commit 'cf00d3ca592037e20053c2d2a7fd734c270e275f':