Bug 885692 - Switch keyboard API patch created by janjongboom