Bug 906497 - Update keyboard plugin