Merge "CEC: Fix OSD name message length"