Merge "Fix alignment when reading note segment."