Fixed issue with wrapping horizontal legends not taking the x option into account. Closes #2680.