TMD 6x10: fixes to OTC side of the MCG display panel code merge