Merge "Remove hide annotation from AXIS_SCROLL"