[master][PATCH] Import Xkl only when really needed