Merge "Clean up UI todos." into udc-dev