Merge "Update string to keep On-screen keyboard naming consistent" into rvc-dev