Merge "Use target component to find existing single instance activity" into rvc-dev am: 16349cb029 am: 19ab2bd162 am: a9d60f5583

Change-Id: Ib1aab1725ec5aeea13661da22bc22142e52d17b1