Merge "Use the real activity component to find reusable task" into qt-dev