WTP: fix event and button reporting

Change-Id: Ic6dce85f17472cfe290b5d430fb713d6c5188213