Merge "Moving trackpad device tracking to a separate class" into main