Merge General QOL -> Main. Fixes footstep sounds always being barefoot sounds after changing to other footwear in inventory (broke in 65844).