Merge "Fix for cursor. Avoid the jump of the grab handle when there is a mix of...