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

Change-Id: I9c3b0ebb63ba46bfcbdf26f46476048d8b53f6c4