Merge "UI fixes" into udc-dev