Merge "Use the real activity component to find reusable task" into qt-dev am: f0cea001 am: 5160de70 am: 2c0ccf29 Change-Id: I5020af47b7d7676560a9c560dd75d6ced0cb8e05