Merge "Refine remove locale warning dialog string" into rvc-dev