Merge "Don't MediaScan files received through handover." into jb-dev