Merge "Prevent multiple handle menus from opening." into udc-dev