* commit 'fb6232635d339c83ca100e472b159f103dafb6e2': DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider
* commit 'fb6232635d339c83ca100e472b159f103dafb6e2': DO NOT MERGE MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider