Merge "Remember the process that token was added for also for the services that are already running" into qt-dev
am: b112f3f62b

Change-Id: Ib8dc2d11e1bcacfd24015794adfa3b08b1157707