Merge "Fix null running task info in SysUI tests" into pi-dev