Merge change 7686 into donut

* changes:
  MediaScanner: Add check for null object in empty title handling code.