Merge "Remove unused HandleMenu variables." into udc-dev