This fixes scaling issues and makes touch work correctly e.g. when using the compositor.
This will create a new commit in order to revert the existing changes.
