Merge "ActivityManager: process stop needs a process to stop" into qt-dev