Merge "Fix media scanner uri handling."