Merge "Remove redundant instances of depth controller." into udc-dev