Merge "Add unified preview UI" into udc-dev