Merge "Use build property for CEC device OSD name" into klp-modular-dev