Merge "Hide one of the divider lines if there are no actions." into udc-dev