Merge "Remove unused code for old mult select design" into udc-dev