Merge "Add default implementation for setTvMessageEnabled" into udc-dev