Merge "Remove two-finger scroll specific code"