Merge "Fix issue #74248644: Swiping away task increments start ID of running services" into pi-dev