Merge "Use the real activity component to find reusable task" into qt-dev am: f0cea00104
am: c58a2d795f

Change-Id: I2bced01438d44f7f7d22b41a1d34a39f89471410