Deciding which branches to target wasn't easy. The bug fixed is practically harmless, but also the fix is very low risk (though there's a "shadowed variable" risk if on some platform some system header uses variable named like what this fix make us to use)
In the end I decided to target all the active branches (S3_0 and up) for the reason of reducing diff between branches to make it easier to port future patches.
'grep -ri "inital"' reveals several places with a typo, missing 'i'. None of them are user-visible.