Merge "Fix how taskview is used by controlsUi" into udc-dev