Merge "Cache media/nomedia paths"