Merge "Allow chooser targets to use two lines" into udc-dev