Merge "Increase the minimal remount scratch size to 64MiB for F2FS scratch"