Merge "gen_scalers: fix 64-bit integer promotion bug"