Merge "Remove unwanted separator bar when description is empty" into udc-dev