Merge "Range check in MediaScanner::processDirectory"