Fix mouse move logic in not full-screen mode
Merge remote-tracking branch 'origin/alex' into alex