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

Change-Id: I93cd5800a77a027cf34e69b3ef118ff43d551f0f