Merge pull request #8970 from Archaeopteryx/patch-1

Bug 830572 - MAC address label overlaps value, r=kaze (cherry picked from commit d0d350489a63bd01c57c1e2ce38c758739073221)