Merge "Re-hide AXIS_SCROLL constant."