Merge "Revert "Add f2fs_write_end and improve trace size"" into main