Bug 930402 - Part I, Small clean up on keyboard launch code
Bug 930402 - Part II, set/remove keyboard.current in keyboard app