Merge "[flexiglass] Fix incorrect error message positioning bug." into main