[master][PATCH] Handle both types of data we can get from libxklavier (#950921)