Merge "Don't prematurely apply finishT in taskview handler" into udc-dev