Merge "Reinflate all headers when locale changes" into rvc-dev