Merge "Remove RefBase from InputListener interface"