Merge "Correct off-by-1 errors in display formatting code." into mnc-dev