Merge "Remove unused instance of setTvMessageEnabled" into udc-dev