Merge "Ensure calls are not unheld between apps automatically." into udc-dev