Hack for Xkb keyboard selection indicator (FWNX-1299)

I'm almost ashamed to submit this, but it does seem to fix the bug.

Change-Id: Icdd237f5464e925cd2184dabd377d7a47079016d