Merge "Add null-check to findLastActiveTaskAndRunCallback" into udc-dev