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

Change-Id: Iec5d33e530f2ea35938da5c9bc7133f676e11d7f