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

Change-Id: I5472775d262334e98873abe060020fbbf6143b73