Folder View: fix some bugs and add placeholder message for empty views

Nate Grahamrequested to merge
work/ngraham/placeholdermessage-in-popup into master

Two commits are model bug fixes, and the final one uses them to add a placeholder message for empty pop-up views.

Placeholder

The first commit might be cherry-pickable; the final two are probably too risky.

Merge request reports