Merge "Fix how task stack listener closes overlays on task changes." into udc-dev