Merge "Remove buttonState from PointerController" into udc-dev