Merge "filebackend: Clean up TempFSFile and fix IDEA errors"