Merge "Consolidate TimerHandler.Callbacks with PointerTracker.DrawingProxy"