Merge "Refactor PointerTracker and MainKeyboardView"