Merge "fs_mgr: IWYU include <algorithm> for std::sort" into main