Merge "fs_mgr: Don't run clean_scratch_files on non-dynamic devices" into main