[OES-440] Don't overwrite display order with default when it's zero.