am 8ca8a69d: Merge "Enable media scanner bulk inserts"

* commit '8ca8a69d5801ad4b809e7b9dbf53bd728820924b':
  Enable media scanner bulk inserts