Merge "Revert "Re-hide AXIS_SCROLL constant.""