Merge "MediaScanner: Fix problem with duplicate directory entries in the database"