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