Merge "MediaScanner: Add virtual NO_MEDIA column to fix support for .nomedia files"