Bug 824783 - Don't show the "empty folder" and "loading" indicators at the same time; r=asuth, a=blocking-basecamp