Use a move-camera event instead of a bunch of different events for mouse moves
Resolve merge conflict