Add workaround for broken hardware keyboard support

Change-Id: If0f9d4725ff446038ec934415863992f85b10495