Merge "Update TvMessageEvent to include a deviceId field" into main