Merge "Moved keyboard settings string to resource file" into main