Merge "Fix issue #2512131: Trackball goes up when moving"