Merge "Don't throw security exception if file was already deleted via filePath" into rvc-dev