am 7dd59229: DO NOT MERGE Fix media scanner uri handling.

* commit '7dd592298aefb7921afb86ced444d46cb30ac466':
  DO NOT MERGE Fix media scanner uri handling.