Merge "MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider"