Merge "Use the real activity component to find reusable task" into qt-dev am: f0cea001 am: c58a2d79 am: 07ab72ee Change-Id: I5472775d262334e98873abe060020fbbf6143b73