Merge "Workaround for handling the restart of an already visible task" into udc-dev