Merge "Adjust TvMessageEventType enum to match Java framework" into udc-dev