Merge "Switch from fminf/fmaxf to std::min/max" into mnc-dev