Merge "Handle adding/removing/renaming nomedia paths"