Merge "Clean up FileSizeFormatter" into main