am 63397ede: am 3cb57672: Merge "Don\'t MediaScan files received through handover." into jb-dev

* commit '63397ede92efd0a31bde340bc301eb3962e3f195':
  Don't MediaScan files received through handover.