Merge "CheckMatrixWidget: Fix alignment issues"