Fix Files module issue that causes the wrong items to be shown

When a user selects a different folder while the current folder’s contents are in the process of being displayed (one at a time), the items that have not yet been displayed will appear in the newly selected folder. This resolves that issue.
Merge pull request #3302 from chrisfranson/patch-2

Fix Files module issue that causes the wrong items to be shown