Merge "Add scrolling support with a mouse wheel"