Merge pull request #8955 from davidflanagan/bug856188

Bug 856188 - scan new videos and parse metadata correctly even when starting a pick activity r=dkuo(cherry picked from commit 8894d2afac10aa7c67fc59ea14caad885ec31089)
Merge pull request #8978 from davidflanagan/bug856188-v1-train

Merge pull request #8955 from davidflanagan/bug856188