Merge "Implement setTvMessageEnabled" into udc-dev