Merge "Fix type issues of TvMessage" into udc-dev