Merge changes from topic "oct15"

* changes:
  Only create a single MediaScanner instance.
  Locale-agnostic case folding.