Merge "Remove MultiDisplayTests#many_to_one_display_mapping" into udc-dev