Bug 834957 - optimize first mediadb scan
Merge pull request #7855 from davidflanagan/bug834957

Bug 834957 - optimize first mediadb scan