Merge "Fix missing param name in NEON scaler functions"