Merge "Remove unnecessary methods of KeyboardSwitcher"