Merge "Fix NPE on ActivityStack.removeTask when launched with invalid taskId" into qt-dev