Merge "Make onClickListener and onLongClickListener overridable"