Merge "Renaming a file causes it to be rescanned"